am 4f9842ca: am 80fea051: Merge "Fix some issues with updating the offsets of...
am 4f9842ca: am 80fea051: Merge "Fix some issues with updating the offsets of a window." into jb-dev
* commit '4f9842ca':
Fix some issues with updating the offsets of a window.