Move draw/measure layers always on top

Fix  #1367