Merge "Update Paint_Delegate following commits 10965f3 and 03b3e23"