Merge "Update night mode Theme.DeviceDefault.Settings"