Merge "Changes to facilitate accurate sub-pel motion search"