Merge "Revert "Anti-alias by default"" into mnc-dev