Merge "Fixed the behavior of group conversations when targeting P" into pi-dev