Make sure we're looking both for json and desktop metadata
We shouldn't assume metadata is in metadata.desktop
REVIEW: 129276