Merge "Fix magnification viewport drifting when scaling"