Merge "Don't recreate the surface unnecessarily" into mnc-dev