Merge "Move default token handling into WindowManagerImpl" into lmp-mr1-dev