Merge "Fix NetworkScoreService#getActiveScorer." into rvc-dev