Merge "Add new bit per sample dialog layout for new Bluetooth developer option"