Merge "Use Animator cancel instead of end" into ub-launcher3-qt-dev
am: 1350be3c21

Change-Id: Id9c598d1e23a33c02a5615a65d44c827cf825d80