Merge "Camera: Add HDR scene mode constants." into jb-mr1-dev