Merge "Refine style picker layout (1/2)" into ub-launcher3-master