Merge "Cascading submenus: Fix a few small issues."