[Forward-port to trunk] Button labels show the key & not its value most of the time

Sometimes the button labels are not translated into the language selected instead only shows it's Key. Check screenshot for reference.