Merge "Ensuring that we use the screen width more optimally in AllApps." into ub-launcher3-burnaby