Merge "Fix going back after biometric enrollment in SUW" into udc-dev