Merge "Clearer message when face auth fails" into qt-qpr1-dev