Merge "Remving SurfaceControlCompat"