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

* commit '09a56563cea260f12b5606837f5b01420b920170':