Improved handling of pending queue delisting.

* Also removed outdated comment.

Change-Id: I5b9a4bf4ed854d58af09e377378997b23549c230
Merge "Improved handling of pending queue delisting."