Yes, for rifle.
For pistol, as I understand, the ATF recently posted a letter stating the opposite for any PISTOL that has a brace. Must be measured collapsed (end of buffer) or folded (end of receiver/folding mount).
https://blog.princelaw.com/2019/07/0...ilizing-brace/