Merge "Handle the case of Preference lists that have header views inserted at the top."