Merge "Fix various animation issues when total width of grid tasks < screen width" into tm-qpr-dev