Cherry pick 3.0 change to skip adding disposables that are already disposed

Discussed in #1467