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

Change-Id: I5f186d71f8db37d483b87d7809fe02661671f014
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0