Merge "Connect TunerDescrambler and DescramblerClient" into sc-dev