Merge "Add new string for new Bluetooth developer option"