New Theme Chooser UI

Change-Id: Ia77ed0fa554ec3dd36d7f94758ffe6481fb80d45