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