Merge "Prevent unnecessary reconnection for wifi privacy" into main