Merge "Skip window exit animation if display has transition" into tm-dev