Merge "Separate buffer stuffing and jank" into sc-dev