Merge "Fix bug in extend_frame chroma extended too far"