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

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