[Merge] lp:~phablet-team/gallery-app/avoid-thumbnailers-from-viewer into lp:gallery-app

[PS Jenkins bot]

Review: Needs Fixing continuous-integration

FAILED: Continuous integration, rev:1130
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1092/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/20
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/20/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/20
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/80
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/412/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/720
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/165
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17222
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/461/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/1092/rebuild

-- 
https://code.launchpad.net/~phablet-team/gallery-app/avoid-thumbnailers-from-viewer/+merge/246997
Your team Ubuntu Phablet Team is requested to review the proposed merge of lp:~phablet-team/gallery-app/avoid-thumbnailers-from-viewer into lp:gallery-app.