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

Change-Id: I22f0968e01cdd8ab20a7abaecc1050f4a1dbbab4