Merge "Handle error connecting to KeychainService" into main