Merge "Using correct gesture margins in overview" into ub-launcher3-qt-r1-dev
am: aaf6c7ce56

Change-Id: I9e32e16101a837a61c9488f4b0d4484982778092