Merge "Add wps icon to wifi panel" into jb-dev