Merge "Add WiFi toggle prompts - settings" am: b4b2c2aa43
am: 6f126a8f5c

Change-Id: I327d6c864ce58c21a74d628d1945f86ff518234c