Merge "Html: Add buttonAttributes() more diligently"