Merge "Fix corrupt arf groups due to low "lag_in_frames""