Merge "Fix NullPointerException in CustomEditTextPreference."