Merge "Remove circular dependency in BlendMode.java"