Merge "Reset visibility before creating leash"