Merge pull request #6830 from lioncash/namespace SettingsHandler: Namespace code under the Common namespace
