Merge "Fix supporting modifying listeners in callbacks" into lmp-dev