Merge "Fix face auth not triggering after lock icon pressed" into qt-qpr1-dev