Merge "Bluetooth: Do not disconnect channel before failover complete" into msm-3.0