Merge "Do not create incoming/disconnected calls on update." into klp-dev