Merge "Close Manage Windows Menu when other menus are closed." into main