Merge "Fix mSubtractDisplacement when recatching" into ub-launcher3-qt-future-dev