Merge "Use default token instead of wrapped window manager" into lmp-mr1-dev