Merge "Avoid potential re-entry as a result of child mutation" into nyc-dev am: 462f29f7 am: 550e6775 am: 6283283f Change-Id: I44e2716406a075430bd4098f545ecdd78c5fa287