am 9eef5bf8: Merge "Be more paranoid about threading in MediaSessionRecord" into lmp-dev

* commit '9eef5bf8d1a69879ada3176c839676dc82b14daf':
  Be more paranoid about threading in MediaSessionRecord