Merge "Add null check before notifying CUJ events" into sc-v2-dev