Merge "Remove unused references to ISurface"