Merge "Wifi select screen redlines" into jb-dev