Merge "Add preferred preview size support in the camera framework"