Merge "Avoid crashing in unlockCanvasAndPost" into klp-dev