Merge "PointerChoreographer: Add drawing tablet support" into main