Merge "Revert "Add a way to override Xfermode DO NOT MERGE"" into lmp-mr1-dev