Merge "Fix bug where we incorrectly clipped the bounds to the device size." into jb-mr2-dev