Merge "Accumulate NotifyArgs inside the lock before notifying" into udc-qpr-dev