Fix of property label formatting

EntityInfo now has labels in multiple labels, but
the code was just picking the first one which produced
inconsistent formatting.

On master, we already have Ia0be6bf which is a much
better solution but it is not trivial to backport.

Change-Id: I24581ef4b11caab7d765f82cff98dbda530c426f