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