Merge "Ensure we compute display name when needed" into jb-dev