Merge "Update connect/disconnect Bluetooth api"