Merge "camera_v2: Changes for dual JPEG encoding"