Merge "Fix token allocation for non-4:2:0" into experimental