Merge "Have consistent All Apps UI between grid size changes." into ub-launcher3-qt-future-dev
am: c3a688a973

Change-Id: I6c9d825e85f55bd3160ab5e2a37e707f3f525459