Merge "PointerChoreographer: Reset stylus icon on HOVER_EXIT" into main