Merge changes from topic 'am-a22b6313-cfa4-4acb-82af-8534aaefc2de' into ub-launcher3-master

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