Merge "Rename the Theme.DeviceDefault.Settings.Dark to QuickSettings"