Merge "Fix regression in Bluetooth settings." into jb-mr1-dev