am 724fff20: am ff6feade: Merge "Listener callbacks ordering fixups" into lmp-dev

* commit '724fff2034e17c601a3787792f8fb73172862c18':
  Listener callbacks ordering fixups