Merge "Closing last tab clears state"