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

[Florian Boucault]

> The change makes sense, and it fixes the bugs as advertised (isn’t one a
> duplicate of the other, by the way?).
> 
> You might want to look into the CI job failures before landing though.

Just some tests instability. It's ok, can we happrove?
-- 
https://code.launchpad.net/~fboucault/camera-app/deletion_fix/+merge/230278
Your team Ubuntu Phablet Team is subscribed to branch lp:camera-app.