Merge "Do not connect to KeyChainService when user is not started" into nyc-dev