Merge "Refactor locks in TunerAdapter"