Merge "Hide alternateBouncer onTrustChanges, not biometricAuth" into udc-qpr-dev