Merge "Change theme base back to Theme.DeviceDefault.Settings"