Merge "Move more utils into paintutils"