Track vanir ThemeChooser

Change-Id: If5ce9cd84212a9ca8adb5ef6863c860e34bff69f