Merge "Rematch wifi networks when the avoid bad wifi setting changes." into nyc-dr1-dev