Merge "[TP] Fix carousel missing" into tm-qpr-dev