Merge "Anti-Alias ColorDrawable" into mnc-dev