Merge "GraphicsTracker: handle dequeueBuffer error while switching Surfaces" into main