Revert^2 "Cache resolved theme values"

6ca48473e533a8b89abac6294a0bb8130b8c8c89

Change-Id: Icb295186b85e1edcdcebc1d746f7ff0d6ef66829
4 files changed