Merge "Reconnect to Bluetooth if user switches back to it"
am: c3a3cad7cd

Change-Id: I9c7fb8954f1ed997107482a1cbc1f64ef068a33f