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

Change-Id: Icd65d19c85cbd83761d8c912533d3409df9b49e7