Merge "Clear face auth locked out state after user switch." into main