Merge "Limit vpx decoder to 4K frames" into oc-dev