Merge "Immediately cancelAutoRemovalCallbacks for removed entry" into main