Merge "Fix crash when updating adapter offsets."