Merge "Handle config changes in Launcher" into sc-dev