Merge "Fix screen magnifier scaling due to ScaleGestureDetector changes." into klp-dev