Merge "Fix the settings app launch animation" into sc-dev