Themes: Support applying components from multiple themes [2/3]

Change-Id: Ic44be174876f10af37351690b65cd105c42d8392
Merge branch 'cm' into HEAD