Merge "Fix ConcurrentModificationException on finishing TaskFragment" into tm-dev