Merge "Fix no cross-profile thumbnail animation" into tm-qpr-dev