Merge "Don't call surface.remove if surface is null." into oc-mr1-dev