Merge "Pause polling for new replies while saving"