Merge "Fixing off by one error in the ScreenMagnifier." into jb-mr1-dev