Merge "ApfV4Generator: eliminate maybeAddLoadR1CounterOffset" into main