Merge "Do not set separate challenge flag before clearing lock" into pi-dev