Merge "Remove scan notification dialog on wifi off" into jb-mr2-dev