Also fix a bug where headings would be ignored while checking for comment frames. See task for detailed explanation. Bug: T303396 Change-Id: I6495826b4b050ea80680e0798ac6ab4497a7c09e