Merge "Log dispatch state when addPointers hits unexpected state" into main