Merge "Camera2: Use scene mode override parameter" into jb-mr1-dev