Merge "Avoid duplicate closing on Tuner instances" into sc-dev