Merge "Relax char limit on menu items from 24 to 28." into nyc-andromeda-dev