* Merge TextField style with global style so that style changes don't override unspecified fields

* Test that a style param is merged with the theme

* Test a few more style properties

* Analysis fix