Merge "Merge "Fix for unexpected scale factors in ScaleGestureDetector" into qt-dev am: 472893443d" into qt-dev-plus-aosp