Merge "Allow SmartDark when not in dark mode"