Merge "SurfaceController API for remote preview in photo picker" into sc-mainline-prod