Merge "Don't mark list headers or invalid items as disabled." into jb-dev