Merge "Fix folder preview animation when adding or removing icons." into tm-qpr-dev