Merge "Don't show NLSes with excessively long component names" into udc-dev