Merge "Fix flickering when swiping up" into qt-dev