Merge "Fix a Rare Race In Clearing ResourceId" into main