am 84be180e: Merge "Fix crash in getNativeCanvas when canvasHandle is NULL" into lmp-mr1-dev

* commit '84be180e97f920a9400789368a6bc54c5a9b90d8':
  Fix crash in getNativeCanvas when canvasHandle is NULL