Merge "sync: dump sync state to console on timeout"