Merge "Pass correct paint to HW layer"