Merge "SurfaceView: Fix missing override for SurfaceControl proxy" into oc-dev am: 42b3610adc am: aec6b4749a
am: 00c2e52c6f

Change-Id: I119bd9a2828c91c25622e4d2c93e8579bbc63726