Merge "Move the additional settings to the top of AppInfoDashboard" into sc-dev