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

Change-Id: I1b1722d2268804aed9dc82d96971143fe34d2097