Track ThemeChooser

Change-Id: I1c03119cebea50d42b153b81c859a940d1c20d85