Merge "[SF] Use render rate to classify BufferStuffing state" into main