Merge #10780: Simplify "!foo || (foo && bar)" as "!foo || bar"