Merge "Fix bug 5307916 - legacy menu theming"