Merge "Fix 2 LaunchParamsPersister issues" into sc-dev