Merge "Attempt to reconnect to weaver before verifying FRP credential"