Merge "TIF: build TvInput list at onUnlockUser" into nyc-dev