Merge "Create SettingsTransitionHelper" into sc-dev