am 272f8bba: am 59210de1: Merge "Avoid crashing in unlockCanvasAndPost" into klp-dev

* commit '272f8bba47dadcf560cf1a11749cf61cbe367a83':
  Avoid crashing in unlockCanvasAndPost