New Theme Chooser UI

Change-Id: I5bf43f3e14c391af3263db8f3bfb8afa39be3928