ThemeChooser Internal until 4.4.3

Change-Id: Id7e7f2d749b6718499e5bf186ba20b544fe4b17a