am 0db354cb: (-s ours) Snap workspace back to screen on ACTION_CANCEL.

Merge commit '0db354cba9c29ea7bd5b736ae05f625a6acf8c88'

* commit '0db354cba9c29ea7bd5b736ae05f625a6acf8c88':
  Snap workspace back to screen on ACTION_CANCEL.