Merge \"Revert \"Cancel animation whenever MotionEvent.ACTION_DOWN is detected\"\" into ub-launcher3-calgary
am: 136a822e02

Change-Id: I2efbd5b0b2eeeea9e7bfd7fbc1dc6550ef028beb