Merge "Tuner APIs: add locks to avoid crashes caused by NPE" into sc-dev