Revert "Have consistent All Apps UI between grid size changes." am: ae190ff807

Change-Id: Iba0049722f377a5aed1836b0a12aec26bd26dab1