Merge "Fall back to normal brightness preset" into main