Merge "Notify user when wi-fi is toggled about scans" into jb-mr2-dev