PreferenceSet refactoring
Merge branch 'master' into nook
PreferenceSet.Reloader (in progress)
Merge branch 'master' into nook
PreferenceSet.Reloader usages
Merge branch 'master' into nook