Merge "Work on removing non-session media routing code"