Merge "Use FooterPreference in xml to replace the header"