Merge "Configure vp10 disabled by default"