Merge "Fix some issues with updating the offsets of a window." into jb-dev