Merge "Drop gainmaps if edited with Canvas" into main