Merge "Add flags for biometrics animation revamp and face auth refactor"