am 6a98dde8: am 9342b049: Merge "Use default token instead of wrapped window...
am 6a98dde8: am 9342b049: Merge "Use default token instead of wrapped window manager" into lmp-mr1-dev
* commit '6a98dde8':
Use default token instead of wrapped window manager