Merge "Override MediaHandlers in tests using MediaWikiServices"