Merge "Avoid IllegalArgumentException in Preference.java compareTo()"