* Fix nested noop block padding in dynamic includes (#38814) * Fix nested noop block padding in dynamic includes * Address issues from the review * Fix typo (cherry picked from commit 5dd8977cfa) * Add changelog/fragment for 38814
5dd8977cfa