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

Change-Id: I5f186d71f8db37d483b87d7809fe02661671f014
Fix build

Change-Id: I26b3db29e6674befe9acee22745c01ef7ded3081