layout animations and concurrent modification fix