Merge "Implement new window cropping." into jb-dev