Merge "Fix NPE when Window disappears during a transition." into lmp-dev