Merge "Moving overview preloading to a separate utility class" into main