Merge "Make quick switch ("hook") more reliable" into ub-launcher3-master