Merge "Tweak generated ctor to allow building from Launcher" into sc-dev