Merge "Omit using ctor of PreferenceViewHolder in tests." into oc-dev