Merge "Only show trustAgentErrors when biometrics aren't engaged" into main