Merge "Fix bug where two items could occupy same grid cell in hotseat." into ub-launcher3-master