Merge "Improve scaling vs pan in screen magnifier." into jb-mr1-dev