Merge changes from topics 'SystemPropPoker', 'DevSettingsPrefsFile'

* changes:
  Refactor SystemPropPoker
  Remove development settings prefs file