Merge "Propagate UIDs for all SurfaceControl instances" into oc-dev am: 6c34dd58f6
am: eccbbe4ca2

Change-Id: I350bb7899eaa1e9919d6fdf8079afd11be4e9918