Merge "Don't re-trigger face auth from notification shade" into rvc-dev