Frequent "index.lock exists" message when it doesn't

In previous versions, every now and then ST would incorrectly claim that index.lock existed. Now I'm getting it pretty much every time I switch branch - the only solution seems to be restarting ST, at which point it's quite happy to switch branch.