Added picker views on SettingsScreenViewController
Merge remote-tracking branch 'origin'