Merge "[Settings] Fix build breakage" into sc-dev