Merge "Add an NPE check to remove NPE during disconnect+cancel pending call" into main