Merge "SubMenuBuilder.getRootMenu() should return root menu, not parent"