Merge "Changing the timeout for detecting syncs that are taking too long to bind BUG: 5222661"