Merge "Removing global state from DeepShortcutManager" into ub-launcher3-master