Bye bye Theme Chooser

Change-Id: I7d7b309fc6a91dcf771312fb6bf153dfde452af6