Merge "Restore ability for getAttributes to set HTMLTextField type"