Merge "Fix TunerService/TunerClient implementation issues" into sc-dev