MP1-4578 : Check against WindowState and not a default WindowState previous value (not filled)