Merge "Rework media router to be per-context with global process state." into jb-dev