automerge: aed1268
* commit 'aed12685b0e6e8146f3f22f5c938a4e3d6ca9b38':
Move default token handling into WindowManagerImpl
automerge: aed1268
* commit 'aed12685b0e6e8146f3f22f5c938a4e3d6ca9b38':
Move default token handling into WindowManagerImpl