Merge "APF optionality for TV devices meeting specific power requirements" into main