Merge "Revert "Revert "Make media command be a shell command"""