Merge "AvoidXferMode -> AvoidXfermode."