Merge "Fix home settings landing page" into sc-dev