Merge "Re-parent children when Organized Window is no longer controlled" into...
Merge "Re-parent children when Organized Window is no longer controlled" into rvc-dev am: 69722e1b am: 4555daa3 am: a0c4e51d
Change-Id: Icc97be5cb5a038ca35d2273e5a124a6280877303