Merge "Separates SFPS and UDFPS BP animation logic" into tm-qpr-dev