am a19f0577: am 8ccf071a: Merge "Move default token handling into...
am a19f0577: am 8ccf071a: Merge "Move default token handling into WindowManagerImpl" into lmp-mr1-dev
automerge: aed12685
* commit 'aed12685':
Move default token handling into WindowManagerImpl