Merge "Shutdown all connections when sync service is hung" into froyo