[automerger] Launcher grid changes. am: 30d0aa2605

Change-Id: I2acf9e9086534266b97846fbf3d9ea4181839f6f