Merge "Add region-tracking to OffscreenBuffers"