Merge "Deprecate settingsActivity field in TvInputService"