Merge "Cancel notification group children when summary is canceled" into lmp-dev