Merge "If the stream for the new bandwidth doesn't have the segment we're looking for..." into honeycomb