Merge pull request #3255 from ExatoGames/develop

Made the retry a little smarter when MediaFactory.GetService fails.