Merge "Remove unused fields in ProgramRaster"