Merge "Fix handling of hidden access points" into jb-mr1-dev