Merge "Fix SipSessionGroup from throwing ConcurrentModificationException" into gingerbread