Merge "Fix Presentation window is removed on stack change"