Merge "Removed separate SurfaceControl for Blast"