(cherry picked from commit 144eb666)

Conflicts:
	drawinglayer/inc/drawinglayer/processor2d/vclpixelprocessor2d.hxx
	drawinglayer/inc/drawinglayer/processor2d/vclprocessor2d.hxx
	vcl/inc/vcl/outdev.hxx

Change-Id: I89f378a4d7a8311b8922f10acff66b000a20a4b7