Fix some more state saving / restoration problems

This specifically fixes restoration of tabs in combination with copying the state of the current tab to a new tab.

(cherry picked from commit a9601bcd1e5d177c77f962a7a86b0fe8bcac8c28)