Merge "Add bit per sample preference for Bluetooth developer option"