Updated window pop in/out with new stack id handling