Merge "Allow listeners to see children" into lmp-dev