Merge "Fix enum comparison to reenable -Wenum-compare"