Underscores do not display properly in MenuButton and SplitMenuButton

Similar to RT-16955, underscores don't display correctly in MenuButtons or SplitMenuButtons (I didn't try Buttons). The problem can be seen in both the button text, and the menu items of the buttons. If there's more than one underscore present, things work fine. Depending on the font, I've seen it overlap the underscore character with the character in front of it (this happened with Tahoma).

See attached sample app.

If there's any hack/workaround that I can put in my application to get this working for 2.0, that would be great.