ThemeChooser Integration

Change-Id: I0d990d93940c7e7d26d746bfb86bd7ff0c360509