Merge "Clean up unused Call Manager strings" into main