am 9f844790: Merge "Remove scan notification dialog on wifi off" into jb-mr2-dev

* commit '9f844790f305338de4fa3adda5e125c811f280ca':
  Remove scan notification dialog on wifi off