Merge "Fix the new QS footer buttons animation" into tm-dev