Merge "Fix thread-safety issues with mRequestedNotificationListeners" into udc-dev