Theme settings override through gridOptions
Merge commit 'c8ce718b1a72650a3bb16128b476cf474e5a8426'

* commit 'c8ce718b1a72650a3bb16128b476cf474e5a8426':
  Theme settings override through gridOptions