Merge "On device categories re-design [1/n]" into ub-launcher3-master