Corrected tracking of Themes chooser manager and provider

Change-Id: I3d83b14b36ad1e54f61f567b352693bcbc04b82c