Merge "Detect sync handler stuck"