Merge "Set desktop icon to always use black for the icon" into tm-qpr-dev