Merge "Simplifying some launcher themes" into ub-launcher3-master