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

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