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

Change-Id: I26ab6eb11e0ef1c53c96585ad069e1a0da629bca