Merge "Settings homepage redesign" into sc-dev