Merge "Bluetooth: Increase Move timeout to allow exit from Sniff mode" into msm-3.0