Merge "Update pending buffer counts immediately" into sc-dev