Use new Theme Chooser UI

Change-Id: I24ddd84db414cde7334cdfa69f14c2a13755319d