Merge "Proper sync-frame detection for sources that don't already provide it." into gingerbread