Merge "Overlap insets with item margins" into ub-launcher3-qt-dev
am: d9c0fe130b

Change-Id: I1718e8778a09dcf9442330c0d40eac77b0e1dc8e