Merge "Camera/Surface: Update OutputConfiguration API" into nyc-dev