Merge "Postponing CUJ start by 1 frame" into sc-dev