[Merge] lp:~osomon/webbrowser-app/remove-content-picker-workaround into lp:webbrowser-app

[Olivier Tilloy]

This supersedes https://code.launchpad.net/~abreu-alexandre/webbrowser-app/fix-filepicker-timer-accept/+merge/264834, per Michael’s comment (https://code.launchpad.net/~abreu-alexandre/webbrowser-app/fix-filepicker-timer-accept/+merge/264834/comments/669533).
-- 
https://code.launchpad.net/~osomon/webbrowser-app/remove-content-picker-workaround/+merge/268298
Your team Ubuntu Phablet Team is requested to review the proposed merge of lp:~osomon/webbrowser-app/remove-content-picker-workaround into lp:webbrowser-app.