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

Change-Id: Ie57f74c1b24aa59798e2bc1239924661fb138d1f