Merge "ART: Simplify more bool operations"