Fix rendering annotation layers with expressions in legend (#4641)
Legend icons do not reflect geometry transformations (#4642)

Conflicts:

	maplegend.c