Merge change 22054 into eclair

* changes:
  Add Bluetooth device picker support