Merge "Fix updateResolvedBoundsPosition offset computation" into tm-qpr-dev