Merge "[Provider Model] Fix settings crash issue" into sc-dev