[Merge] lp:~gerboland/qtubuntu/screen-info-drop-panel-hack into lp:qtubuntu

[Michał Sawicz]

Text conflict in src/ubuntumirclient/input.cpp
Text conflict in src/ubuntumirclient/window.cpp
2 conflicts encountered.
-- 
https://code.launchpad.net/~gerboland/qtubuntu/screen-info-drop-panel-hack/+merge/286314
Your team Ubuntu Phablet Team is requested to review the proposed merge of lp:~gerboland/qtubuntu/screen-info-drop-panel-hack into lp:qtubuntu.