Merge "[MS71] Remove remaining dependencies in SettingsLib"