Merge "Revert "Comment out CustomEditTextPreferenceTest which is failing...""