Merge "Turn off re-evaluate when the network resumes by default" into main