Merge "Fix lost window warning"