Merge "b/3392594 keep the remain touch points when one is ended." into honeycomb-mr1