[stable-3.10] maintain lock state if unlock happens during sync

[stable-3.10] maintain lock state if unlock happens during sync #2748