Merge "Revert "Add a way to override Xfermode""