[Merge] lp:~dandrader/qtubuntu/resizeCatchUp into lp:qtubuntu

[Gerry Boland]

Review: Needs Fixing

Put the logging change in a different MR, not this one. I'm not convinced by it, we've used the logging.h macros for some time. If it is faulty, we should either fix it, or replace it everywhere, not just a solution in this file.

Please put in a note saying that the resizeCatchup stuff is working around a bug in Mir. It should not be necessary
-- 
https://code.launchpad.net/~dandrader/qtubuntu/resizeCatchUp/+merge/269195
Your team Ubuntu Phablet Team is subscribed to branch lp:qtubuntu.