Merge "Clean up SettingsUnitTests unused dependencies" into main