Merge "Add new sample rate dialog layout for new Bluetooth developer option"