Don't let untranslated "<unknown>" or "null" be displayed in Music.

Finally checking in an old fix (for bug 1785503 and bug 1785492)
that got bumped from Cupcake.
2 files changed