Merge "Add null check to onTransitionMerged" into udc-dev