Merge "Fix deadlock between Tuner.requestDescrambler() and resource reclaim" into main