3.0: update caller_id merge, backport MWI fix, and correct reorder issue