Merge "Improved uv mv calculations in build inter predictor"