Tolerate and recover from ACG tracking mismatch