Merge "Fix ConcurrentModificationException in DashboardCategory."