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

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