I think bookmark is using WrapperFactory to produce the window so it's out of scope of this change.