am aed86520: am b6eaaa2a: Clean up cacheColorHint to be better controlled by the theme.

Merge commit 'aed865207f7425f6c4d0538decb04109c415410d'

* commit 'aed865207f7425f6c4d0538decb04109c415410d':
  Clean up cacheColorHint to be better controlled by the theme.