Themes: Let ThemeService handle all theme processing [3/3]

Change-Id: Ied877eb5f1e96774d2e415970034d0b892765134
Merge "Themes: Let ThemeService handle all theme processing [3/3]" into cm-11.0