Merge "Pass correct config values during SurfaceController creation" into sc-mainline-prod