am 62563523: am c4a6df22: am 96192157: am f175b19a: Merge "Fix a bug where OnTouchListeners in action views could be removed" into klp-dev

* commit '6256352364c53ce841e7635f637713a0b7677be6':
  Fix a bug where OnTouchListeners in action views could be removed