Merge "vp8: Add extra conditon for overshoot-drop"