am be7ca98a: reovle conflicts for cc089099

* commit 'be7ca98a86a6fc6de822a410c3234fbccd67fd0c':
  update sdk template... thought this was merged already, but also re-add section for offline preview