[Merge] lp:~artmello/camera-app/camera-app-show_preview_content_picker into lp:camera-app

[Sebastien Bacher]

Review: Needs Fixing

That has been sitting there for a while and now has merge conflicts, it needs at least to be rebased ... could you do that if it's still accurate, then maybe we can try to get it landed?
-- 
https://code.launchpad.net/~artmello/camera-app/camera-app-show_preview_content_picker/+merge/244615
Your team Ubuntu Phablet Team is subscribed to branch lp:camera-app.