Merge "Merge "Fixing edge swipe region not updating on device rotation" into qt-dev am: 44519220 am: e5f8230f"