Cleanup PopupMenu class and MediaBrowser includes.
More cleanup.
Start working on the MenuManager migration.
More menu code implementation, but still no menu bar at this point