Merge "Refactor out zero motion vector equivalence."