Merge "Handle error connecting to KeychainService" into udc-qpr-dev