Merge "[WifiScoreReport] Stay on working wifi" into pi-dev