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