Merge "Fix latching of final buffer when moving off-screen and destroying" into sc-dev