am d9bf0d1a: Merge "Fix UI issue with Bluetooth Settings." into ics-mr0

* commit 'd9bf0d1afa7857ec3f678ac2aa041b42bcf2ef5a':
  Fix UI issue with Bluetooth Settings.