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

* commit '59210de17c840bb60fc1c623250df8f39ebba132':
  Avoid crashing in unlockCanvasAndPost