Merge "Carry over app token when preserving window"