Merge "Revert "Test Fix SettingRobolectricTest Fail"" into main