Merge "Make TvInputManagerService robust against user race conditions"