Merge "Create SettingsTransitionActivity" into sc-dev