Merge "Use regular preference theme for setup wizard"