[Merge] lp:~uriboni/camera-app/query-manual-focus-supported into lp:camera-app/staging

[Florian Boucault]

Attempt to merge into lp:camera-app/staging failed due to conflicts: 

text conflict in ViewFinderOverlay.qml
-- 
https://code.launchpad.net/~uriboni/camera-app/query-manual-focus-supported/+merge/283287
Your team Ubuntu Phablet Team is requested to review the proposed merge of lp:~uriboni/camera-app/query-manual-focus-supported into lp:camera-app/staging.