[Merge] lp:~fboucault/camera-app/ui_rewrite into lp:camera-app

[Bill Filler]

Review: Needs Fixing

and one other thing: we don't want to broadcast ourselves as a source for pictures yet because we don't provide a picker interface yet. I misintrepreted what those were for. So you can revert rev 339 and 338
-- 
https://code.launchpad.net/~fboucault/camera-app/ui_rewrite/+merge/224451
Your team Ubuntu Phablet Team is subscribed to branch lp:camera-app.