Merge "Gate face auth on display off in the face auth refactor" into main