[Merge] lp:~artmello/gallery-app/gallery-app-remove_photo_from_album into lp:gallery-app

[Bill Filler]

Review: Needs Fixing

found an issue:
- add two photos to an album
- delete the second photo from the album with "remove from album and delete"
- the first photo is shown after the delete but no toolbar is visible and user gets stuck as no way to get back to the album view
-- 
https://code.launchpad.net/~artmello/gallery-app/gallery-app-remove_photo_from_album/+merge/222739
Your team Ubuntu Phablet Team is subscribed to branch lp:gallery-app.