Merge "Avoid NullPointerException in MediaRouterService" into tm-dev