Cancel pending auto-save if manual save occurs.

Closes #4309