Merge "Fix ConcurrentModificationException in QuickstepWidgetHolder" into udc-dev