Merge "Anti-alias by default"