Merge "Calculate pattern bounds correctly" into qt-dev
am: a9610c2452

Change-Id: If7be3c6daff97e78bf28e572e1fada447b41e70f