Merge "Removing SurfaceControlCompat"