Merge "Revert "graphics: improve preloading for IMapper default impl""