Merge "camera2: Workaround for null FACE_DETECT_MODE crashing" into klp-dev