Merge "Tweak root item layouts." into nyc-dev
am: f8d6fa2c5a

* commit 'f8d6fa2c5a42b9adaa7a745bc9c9feaeb3800cc3':
  Tweak root item layouts.