Merge "Add androidx.core.animation dependency for better testability" into tm-qpr-dev