Merge "Load app icons defensively" into tm-qpr-dev