Merge "Revert^2 "VP9: Synthesize CSD from frame header"" into main