Merge "Added constructor to ShortcutKey." into ub-launcher3-master