Merge "Refactors in UserEventDispatcher" into ub-launcher3-master