Merge "Copy display name into Organization entry" into lmp-mr1-dev