Merge "[Provider Model] Use correct icon for Calls & SMS"