Merge "Fix Settings crash issue" into sc-qpr1-dev