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

Change-Id: I3508e7ce9766277c9ace8f4cf790efd6c55417c7