[R40] Add MultiTheme feature patches.