Merge "Fix build - Revert "Revert "Use default constructor to get anti-aliasing""" into mnc-dev