am 96a424e2: am 184016aa: Merge "TIF: Build the list of available TV inputs as the current user" into mnc-dev

* commit '96a424e261c55f08de8f1c6a3d5c7547030aafab':
  TIF: Build the list of available TV inputs as the current user