Merge "Fix NPE in FaceDetectClient" into sc-dev