am 08b30908: Merge "Ensure we compute display name when needed" into jb-dev

* commit '08b3090848ad211e043a561b6bb774adf3a7bba1':
  Ensure we compute display name when needed