Merge "Chaning touch to tap" into ub-launcher3-calgary
am: 7de283a5ec

* commit '7de283a5ecb39bf1f264b5d0d8019b6fabdd6ae3':
  Chaning touch to tap