Merge "Tweak root item layouts." into nyc-dev