Merge "vp9-svc: Fixes to make SVC work with VBR" into main