Merge "Separating SystemShortcut and Factory" into ub-launcher3-master