Merge "Preserve environment when launching overlay_remounter" into main