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

Change-Id: I8db5151004940974b5638ad689659473fcd82895