Merge "Fix lack of notification of un-parent on disconnecting conference child." into oc-dev