Merge "Fix regression in swiping up from lockscreen" into qt-dev