Merge "Change the PreferenceViewHolder constructor to be restricted."