Always remove headings if requested

Bug: 57402
Change-Id: I7fd8785610061885fd4ca1e468b87a6084ff6952
Merge "Always remove headings if requested"