Merge "Camera: update preview size selection logic" into marshmallow-cts-dev