Avoid iterating a container while it's being mutated

Fabian Vogtrequested to merge
work/fvogt/kde437364 into master

Otherwise the iterators get invalidated and weird stuff happens.

CCBUG: 437364

Merge request reports