Merge "Fix deadlock between TRMS lock and Tuner.mLnbLock" into main