Merge "guard new Xfermode API usage in Paint" into main