Merge "vp9_pickmode.c resolve vs issue"