Merge "Update folder leave-behind color for taskbar" into tm-qpr-dev