Merge "Avoiding system server dump stuck by pipe buffer full." into sc-dev