Merge "Fix input/output of MediaShellCommand"