Merge "Assume no divider if not PreferenceViewHolder"