Revert "Handle theme changes"

This reverts commit 64718d775ce8322915d143adb9a0f1ea3160e9e3.

Change-Id: Ibf92232dfa8ee96aafecc4b4e49fc55cfb21c229