Merge "Set the render rate on the created surface frame instead of the old one." into sc-dev