Merge "Factor our mChildrenChanged from doTransaction" into sc-dev