Merge "Block face auth when lock icon is pressed" into qt-dev