Merge changes I58c7fed1,Ic26b782f into developers-dev

* changes:
  Add default icons to templatized samples
  Template: Move launcher icons to "create" dir