Partially fixed by Caolán in
3ac80237.

Remaining issues are the paragraph submenu, and the top
menu for both selection and paragraph. Also fixed for
the drawing text and annotations shells (including the
regression created by the above commit, that the dialog
didn't show at all).

Change-Id: I1ba4c825ad48af23ad5c07c8c5f25380952c0be1