Merge "Improve Wi-Fi Settings UI in guest mode" am: 31f64a1253
am: 241d902200

Change-Id: I945b4604a82b8fccc2c24ea3faf1d7b299b3cfb7