ThemeChooser Integration

Change-Id: I4004e1f27f802232c75735f2f1cbb9bbc451e0d8