Merge "Refine Style/Grid picker recyclerview layout" into ub-launcher3-master