Merge "Fix parent call not being identified as a conference call" into klp-dev