Merge "Fix bug 3242965 - Unreadable text in context menus using legacy theme"