am 771466f6: resolved conflicts for da76169f to lmp-dev

* commit '771466f6a00c2bd123edac644b66963b32fc5184':
  TIF: Verify if the TV app shows EPG for 3rd-party input