Merge "Simplify getNewOffset()"