Merge "NoMan: Cancel children when update removes summary" into lmp-dev