Merge "Add a private method to retrieve the header list from PreferenceActivity" into jb-dev