Merge "Don't let face failures override face lockout messages" into main