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