Merge "enable custom shortcut test" into ub-launcher3-master