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

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