Merge "Revert "Revert "Remove outdated media permission checks."""