Merge "Fix setting of map_offset in frame data."