Merge changes from topic 'am-ad7d3769-753e-4ddd-97fb-2d13b2d07948' into ub-launcher3-dorval-polish2

* changes:
  Factor in CellLayout padding in cell size calculation. am: 8632d9dd1e
  Factor in CellLayout padding in cell size calculation.