Merge "Use NetworkScoreManager when disabling scoring." into lmp-dev