Merge change 5829 into donut

* changes:
  Fix issue #1673793: Theme styles don't apply.