Merge "Fix use-after-free in ResourceManagerService::removeResource"