Merge "Fix startFaceDetection will fail after taking a picture." into jb-dev