Merge "Use non-zero mode threshold for NEARESTMV modes"