Merge "Add flags for biometrics animation revamp and face auth refactor" into tm-qpr-dev