Merge "Detach children when stopping app." into pi-dev am: 331a22e39a
am: 56bb79dc1f

Change-Id: I7b9747ef1139dfc6b54204d28270d4bc428ab3f9