Merge "TIF: Clean up TvInputServiceExtensionManager" into main