Handle theme changes

Change-Id: Ib933df8ef825ac35dfcf3207be5f803c2da18f56
Merge "Handle theme changes" into kitkat