Merge "enable email for PreferencesTest.php"