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

Change-Id: Idef71123fde9475a549a1ccab136564ccf3d4a4a