Merge "HeadersFragment tweaking" into nyc-dev