Merge "Crash occurs when entering a Bluetooth broadcast password" into main