Merge "[Settings] Avoid from crash - SystemProp default null" into sc-qpr1-dev