Merge "TvInputHardware: Integration with audio framework changes"