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

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