Cleanup toolbar locationChangeStart handling