Merge "Use ACTION_UP instead of ACTION_DOWN in handler" into tm-dev