WPS: Reduce scan wait time during WPS processing