Merge "SurfaceControlViewHost: Clone control for SurfacePackage" into tm-dev