Merge "Disable WPS if CHANGE_WIFI_STATE is revoked" into pi-dev