Merge "Optimizing some icon generation code in bubble" into tm-qpr-dev