I put 22.31" on my Form 1 when I SBRed it. That's with the standard HK folder and a PDW barrel (threaded & 3-lug).
Came back approved.
This photo is with the shorter Choate stock. Once approved, don't think ATF worries if the length changes as long as you can return it to the originally approved configuration.