Merge "Merge "Calculate pattern bounds correctly" into qt-dev am: a9610c2452 am: 3f02a31d7c" into qt-r1-dev-plus-aosp