PT46890219: add internal caller-id rewrite in UI

- fix .gitmodules merge issue