Merge "Revert "blast: create SurfaceControl from Surface parent""