Merge proposals dependent on lp://staging/~thomas-voss/ubuntu-touch-session/add-trust-stored-skeleton-for-camera-service

1. add-trust-stored-skeleton-for-camera-service
2. Dependent merge proposals