Merge "Prepare Overlays for MainUser earlier" into main