Merge "Add SurfaceControl to hwui" into sc-dev