Merge "Use Theme.DeviceDefault.Settings"