am c8c5bc44: am 09a56563: am 04217efb: Merge "Fix 5514230: preventing null window token from occurring" into ics-mr0

* commit 'c8c5bc443fe63e96c91fc96bf8db8ce7dd177073':