Merge "Rearrange a few of our MIME type registrations." into lmp-dev