Merge "Add reminder about scan settings on wifi off" into jb-mr2-dev