Not sure if this has been solved, but I just discovered that if you use the render bitmap tool to render, and then re-render using the standard interface, it seems to reset itself. I haven't tested this work around with viewports yet, but wanted to put that out in the world. Certainly better than having to restart, which is obviously a huge timesuck.