Merge "When dragging past first or last state, don't reinit target" into ub-launcher3-master