Merge "Be more paranoid about threading in MediaSessionRecord" into lmp-dev