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