Merge "WifiScoreReport: Send onStop to scorer on linger" into sc-dev