Merge "Fix face auth not triggering after lock icon pressed"