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