Merge "Pointer Icon Refactor: Cache all used display contexts" into main