Merge "Fix SettingsActivity name" into sc-dev