Merge "Adjust Tx/Rx byte count threshold" into sc-dev