Merge "Fix potential dex index overflow in dx"