Merge "Fix range checks in motion search"