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

* commit '04217efb8eaebdbd846671a2f743fa3e960b5dde':
  Fix 5514230: preventing null window token from occurring