Merge "Show more menu items on larger devices." into nyc-dev