Merge "[sf] HdrOutputControlTest: fix strategy arguments" into main