Merge "Show phone menus correctly"