Store: Added Geometry samples to match desktop
- also minor changes to fix some desktop samples