Merge "[DO NOT MERGE] Return correct offsets for getAttributeRange()" into qt-dev am: acd260e1 am: a17985f0 Change-Id: I02836eb40e541150899fd7a42a5c38cd0d9fa933