Merge "Fix deadlock between MediaSessionService and MediaSessionRecord" into main