* Refactor caller id privacy for the users submodule * Refactor caller id privacy for the devices submodule