Merge "Fix performance regression in ModesTileMapper" into main