am 3b5096be: Merge "Add missing checks for the current session callback" into lmp-dev

* commit '3b5096be57ed382d6963da85e5c66bd74bcb8755':
  Add missing checks for the current session callback