Merge "Increasing wait time for end-action events." into ub-launcher3-master