Merge "Tweak dark area thresholds." into sc-dev