Merge "Fix NPE in MediaRouterService" into oc-dr1-dev