Merge "Adjust display name of call log for 4G conference call" into atel.lnx.2.0-dev