Merge "Face auth messaging cleanup" into qt-r1-dev