Merge "Rearrange System settings" into sc-dev