Merge "Require strong auth after user is stopped" into pi-dev