Merge "Avoid potential re-entry as a result of child mutation" into nyc-dev am: 462f29f7 am: f9489216 am: 6c1e7451 Change-Id: If5ce87ac37637948aae79af46ca54b4d4be13985