Merge "Retrying face auth when the camera changed while face auth is running" into main