Draw Undo independently can reinsert a caption to the drawlayer, which
is beyond our knowledge. To track that cumbersome manual tracking (or
callbacks or whatever) would be needed, which actually this tries to get
rid of instead of increasing..

Change-Id: I373843ad61d0b6e19b9d3f98fd8f9e01a448296d