Merge "Fix finishTransaction position when Shelf height is changed" into tm-dev