Merge changes from topic 'am-7585e4a8-2edc-4122-a7e4-3366e2146d4b' into ub-launcher3-master

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