Merge "Camera2: Adding support for 4kx2k resolution"