Merge "Close the session if Fingerprint servers die" into udc-dev