Merge "Revert "MediaRouter: add routing controller in MRM""