(cherry picked from commit 573490c7)

Conflicts:
	sd/source/ui/sidebar/LayoutMenu.cxx

Change-Id: Ie5c0a1e15ea8db2d2b033efb1234492bd438658d

Related: #i122093# WaE in DrawController::BroadcastContextChenge()

(cherry picked from commit 26e4fcdb)

Change-Id: I416215077643f3eb4d43eb761e457d0893bcc429