Merge changes from topic "am-b9751869-5607-4cac-8442-b1dba848150a" into ub-launcher3-master

* changes:
  [automerger] Update launcher grid for tablet devices. am: 5eacbb7fc1
  Update launcher grid for tablet devices.