Merge "Revert "Replace Media namespace redirects with File namespace""