Also remember it in the thread itself, otherwise we are likely to close
the newly created one, instead of the old one (when loading the document
the 2nd time).

[This is the most important piece of the '2nd start crashes' puzzle.]

Change-Id: I3bb89882b6f3ac1493c47a27b4c4589b6996afab