Merge "Don't auto-restart face auth after successful auth" into rvc-qpr-dev