Merge "Re-enable on/off switch for Wi-Fi and Bluetooth Settings"