Merge "Cleanup SettingsChangeLogger onClose()" into udc-dev