Merge "Always draw dividers for footers and headers when explicitly enabled."