Do you mean this to be part of this CL? I have the same concerns with storing UI information in the workspace as I did before...