Merge "Move pointer icon caching logic into a new class: PointerIconCache" into main