Merge "Fix NPE in TvInputService and TvView"