Merge "Fix WPS handling when already connected" into jb-mr2-dev