Merge "Remove event listeners when touch session ends" into udc-dev