[automerger] Launcher grid changes. am: 30d0aa2605 am: 3aa645b7e6

Change-Id: I04ac3ff58949f16a3f0de820efe5da0536fc306b