Merge "Add mutual exclusion access for addOrUpdateStream and removeStream"