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

* commit '998a68369fcf7928b6fa58d6312426f88a27a39e':
  Add a private method to retrieve the header list from PreferenceActivity