resolve merge conflicts of a6194d3d92 to ub-launcher3-calgary
am: f940684626

* commit 'f94068462649986dad263f28226be6c514af47d3':
  Wrapping thw widgetList inside a layout, so that it has the same view structure as allApps