Merge "Update ColorFilter_Delegate following Change I5f74addd"