New Theme Chooser UI

Change-Id: I3e0ece8ec26666c0cdb57087ad4076b4ad9fd0d7