Merge "Propagate UIDs for all SurfaceControl instances" into oc-dev