Merge "[Chipbar] Don't add null icon descriptions to the main description." into tm-qpr-dev