Merge "Allow null queues to be set in MediaSession" into lmp-dev