Merge "Fix layout for menu item checkbox and submenu arrow."