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

Change-Id: I0c9838920603a22acd16cd5f9d8a4f107af82968
Merge remote-tracking branch 'cm/cm-11.0' into HEAD