Merge "Update SettingsTransitionHelper" into sc-dev