Merge "Fix NPE crash when merge transition to remote transition."