Merge "Add null check to work around async unregistration of receiver" into sc-dev