Merge "Prepare main looper before setting pre-init argv" into main