Merge "Change theme back to DeviceDefault.Settings."