(cherry picked from commit 0a4564b4)

Conflicts:
	vcl/osx/a11ytextattributeswrapper.mm

Change-Id: I786815feb847a2a340d2e3d24c9a8a01bb7ace7c