Merge "Mapping header items in BrowseFragment to multiple(2) rows." into nyc-dev