Merge "Bug fix in motion vector limit calculation"