Merge "SnapdragonCamera: Fix face detection UI offset"