Merge "Moving all scaling logic into BrowseFragment." into nyc-dev