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

* commit 'ad5b0eb7a7571389b0ec1f5195a60e16797920f5':
  Notify user when wi-fi is toggled about scans