Allow local prefs to show up on global prefs page

Causes weird issues with skin/language randomly changing.

Change-Id: I87f98cc07b552d654989cd8e00991a1dc8c926b7
Rename GlobalPreferences::resetUserSettings

Clarify it is specifically for global prefs

Change-Id: I4a865c0fcdcd2dca134400ec66f74fee9dd6199d