Merge "Fix bug 5044737 - Compatibility menus should be as wide as the screen width"