Merge "Enable SETTINGS_API_V2" into sc-dev