Merge "Fix a few issues with Studio\'s WatchFace template" into studio-1.2-dev
automerge: bd67b33

* commit 'bd67b33b57fd9e8c7cc7da84f6912f1f1b8ca468':
  Fix a few issues with Studio's WatchFace template