Merge "Pointer Icon Refactor: Load resources for system icons before drawing" into main