Merge "Adds null-check on finger animation in enrollment" into tm-qpr-dev