Merge "TIF: Extend multiple TV input per service for HDMI logical devices" into lmp-dev