Sweeping !57195 from master to 22.0. Fixing size and position of special D4 cells in TileCal See merge request !57223