Restored PreferencesViewController with unifiedUI
Merge pull request #41 from rbarbera/master

Test selection screen UI unified