Merge "Make SpecialPreferencesTest::testBug41337 non-risky"