[Merge] lp:~canonical-platform-qa/camera-app/lp1366825_fix_zoom into lp:camera-app

[Omer Akram]

There seems to be a bug in the icons model, the settingsProperty for torch icon is sometimes given to the location icon, so that results in the test clicking on the wrong icon, hence causing test failure. https://bugs.launchpad.net/bugs/1369573
-- 
https://code.launchpad.net/~canonical-platform-qa/camera-app/lp1366825_fix_zoom/+merge/233725
Your team Ubuntu Phablet Team is requested to review the proposed merge of lp:~canonical-platform-qa/camera-app/lp1366825_fix_zoom into lp:camera-app.