Merge "Sanitize display names, keep extensions intact." into lmp-mr1-dev