Merge "Mediarouter: clean up callbacks" into tm-dev