Revert "Fix issue with white and black themes"

This reverts commit 860f61b4caa105909c919ca5e12747c6b917f78e.

Reason for revert: Broke one sysui test

Change-Id: If43b21fc6588bbbb0e42e5159f70c94e52773c2a
2 files changed