Merge "Add option to allow customize HeadersFragment" into nyc-support-25.2-dev