Fix forgetting queue when deleting offline.
Merge bug26468
stable to default