According to the FAQ, yes, as TaxMonkey says.  Many, however, argue it is not fair, for the reasons you stated.

Some are falling in line with the FAQ issued at the 11th hour while others are contemplating what they'd do with returns that they filed with a different position before the time of publication.  There are yet others who still believe that the FAQ carries no authority (and is not even affirmative in using "may" as the modal verb), which means it comes down to whether one believes the Final Regulations require this duplication or not and, therefore, whether disclosure may be necessary.

As we previously discussed (in this link), the plain reading of the reg does seem to suggest that it is required but the final clause of the subsection is what might open this to interpretation: https://accountants-community.intuit.com/questions/1799581-lacerte-says-the-qbi-deduction-is-not-aff...

In other words, there doesn't seem to be a consensus on this and the IRS is not helping. Just know that you're not alone in this.