Merge "Fix "Turn on Wi-Fi scanning?" does not pop up when clicking "Turn on...
Merge "Fix "Turn on Wi-Fi scanning?" does not pop up when clicking "Turn on Wi-Fi automatically"" into qt-dev am: 41656de5
am: 3ce43820
Change-Id: Idd3be7b3e359a0e71bab0afd6ea016dae38f6f17