More theme manager cleaning and optimizations.

PS2:
Remove unnecessary local Bitmap

Change-Id: I733c439ace2bd09472e5d049c825e19b03751506
Merge "More theme manager cleaning and optimizations." into jellybean-mr2.1