Merge "Remove old recyclerview layout logic" into ub-launcher3-master