Merge "ResetLockout should be scheduled on FaceService's handler" into qt-r1-dev