Fix A layer using a mask and a label with repeatdistance can crash (#4764)
Merge branch 'branch-6-2' into branch-6-4