am c7a873e3: Merge "Ensure we update the active pointer id on pointer up/down." into mnc-dr-dev

* commit 'c7a873e356e1caa815c1830ae37a6ffb3ecf480f':
  Ensure we update the active pointer id on pointer up/down.