Merge "Remove authenticator data if it was disabled." into main