Merge "TIF: misc fix for TvInputHal" into lmp-dev