Merge "Clean up MimeMagic singleton handling"