Merge "Fixes IllegalStateException caused by child already having parent"