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