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

Change-Id: Ia3aa4d9537f141a3132afefbcdac5b0bda61722b