Merge changes I2130e01c,I3f864ff4 into ub-launcher3-master

* changes:
  Re-enable input consumer to catch touches over window
  Cancel the animation when cleaning up the touch tracking