Merge "Improve display name to avoid callback when it did not change"