Merge "Fix a mess in contexts/surfaces reference count"