Merge "MediaRouter: don't scanPackages if unnecessary" into rvc-dev