Merge "Moving come helper methods to corresponding classes" into ub-launcher3-master