Merge "Reduce the amount of allocations on Paint_Delegate" into mnc-ub-dev