Merge "Removing SettingsLib dependency from WMShell" into sc-dev