Merge "Defer window removal including app transition"