Avoid potential re-entry as a result of child mutation

Don't set the callback until we're all done making changes.

Bug: 30902893
Change-Id: Ia1560692a83ecb2c50f5e77fa4d1e8155a78a204
(cherry picked from commit b46ba3b2b0268688852cdf3d1fb4afe4873d63be)
(cherry picked from commit 66b3a0d1aa48d5d663dcad86468605c565bb1880)
1 file changed