Merge "Using cellX and cellY for comparing position when rank is not available" into ub-launcher3-burnaby