am 6e51630b: am 6cc74de5: am eebd9249: Fix bug 2236111 - right edge of widget chopped-off while dragging

Merge commit '6e51630b0fbacf4beb339cfeefa762cb66f03ba8'

* commit '6e51630b0fbacf4beb339cfeefa762cb66f03ba8':
  Fix bug 2236111 - right edge of widget chopped-off while dragging