Merge "Revert intent action to show media output switcher dialog."