Merge "Null checking window before starting dream" into tm-qpr-dev