Skip adding disposables that are already disposed
Merge pull request #1478 from talko/disposablecherrypick

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