Merge "When removing windows remove from resize list." into jb-mr1-dev