Merge "Listener callbacks ordering fixups" into lmp-dev