Merge "TvInputManagerService patch"