Merge "Clean some phpcs errors in Preferences.php"