Merge "TvInputHardwareManager: always try patch recreate if null"