Fix stuck test "Syncing then turning it off" #8520

Merged
merged 1 commit into from Apr 27, 2017