am 9c7c737a: Merge "Ensure there\'s a valid handler when registering a sessions listener" into lmp-dev

* commit '9c7c737a603807e727721d00b70a227f60c674e1':
  Ensure there's a valid handler when registering a sessions listener