Merge "Don't remove active stacks from window manager" into lmp-dev