Merge "Port SurfaceControlViewHost to BLAST" into sc-dev