[automerger] More launcher grid updates. am: 3f9bab2fe4 am: 0aa02ecc4b

Change-Id: I0a5657f8df760d19d06bec03e2f8ff9ea16d24cd