Merge "Fix Settings crash" into sc-dev