Merge "Checking BadOffset while queuing buffers" into main