(cherry picked from commit a8c471a7)

Conflicts:
	vcl/osx/salframe.cxx
	vcl/osx/salframeview.mm
	vcl/osx/salnsmenu.mm
	vcl/osx/salobj.cxx

Change-Id: I379d80355d741dd28aad2e6119a8b82ac10159f5