Merge changes I28d77e66,I24cd9fe1

* changes:
  BatteryController: Listen to battery changes from Bluetooth metadata
  BatteryController: Get Bluetooth battery level from callback