Merge "Always send userId to FaceService" into qt-r1-dev